]> dgit.raspbian.org Git - gnome-shell.git/commitdiff
popupMenu: Close all child menus when the main menu is closed
authorJasper St. Pierre <jstpierre@mecheye.net>
Sat, 16 Feb 2013 18:43:01 +0000 (13:43 -0500)
committerJasper St. Pierre <jstpierre@mecheye.net>
Mon, 18 Feb 2013 18:31:15 +0000 (13:31 -0500)
Otherwise, if something managed to call close(), it wouldn't
close any child menus.

https://bugzilla.gnome.org/show_bug.cgi?id=693572

js/ui/popupMenu.js

index 538d9b6e5b7b389cffa53cac1f2b860c4e6c9b08..d65f03f21248ebd754574780a2f06e6d9ce5e231 100644 (file)
@@ -1267,6 +1267,10 @@ const PopupMenu = new Lang.Class({
         if (this._activeMenuItem)
             this._activeMenuItem.setActive(false);
 
+        this._childMenus.forEach(function(childMenu) {
+            childMenu.close();
+        });
+
         if (this._boxPointer.actor.visible)
             this._boxPointer.hide(animate);